From 52bbc0f440116520406e4bd36fa8ad42a0589630 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 18 Jan 2008 13:35:05 +0000 Subject: [PATCH] qemu-dm: Nicely terminate the device model script, to let it properly clean resources. Signed-off-by: Samuel Thibault --- tools/ioemu/target-i386-dm/helper2.c | 10 ++++++++-- tools/python/xen/xend/image.py | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/ioemu/target-i386-dm/helper2.c b/tools/ioemu/target-i386-dm/helper2.c index e0f16845f6..03dd7e8507 100644 --- a/tools/ioemu/target-i386-dm/helper2.c +++ b/tools/ioemu/target-i386-dm/helper2.c @@ -637,6 +637,7 @@ int main_loop(void) int evtchn_fd = xce_handle == -1 ? -1 : xc_evtchn_fd(xce_handle); char qemu_file[PATH_MAX]; fd_set fds; + int ret = 0; buffered_io_timer = qemu_new_timer(rt_clock, handle_buffered_io, cpu_single_env); @@ -647,10 +648,15 @@ int main_loop(void) xenstore_record_dm_state("running"); while (1) { - while (!(vm_running && suspend_requested)) + while (!((vm_running && suspend_requested) || shutdown_requested)) /* Wait up to 10 msec. */ main_loop_wait(10); + if (shutdown_requested) { + ret = EXCP_INTERRUPT; + break; + } + fprintf(logfile, "device model saving state\n"); /* Pull all outstanding ioreqs through the system */ @@ -676,7 +682,7 @@ int main_loop(void) xenstore_record_dm_state("running"); } - return 0; + return ret; } void destroy_hvm_domain(void) diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index 85e7e4fa08..ca79cb8fae 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -321,7 +321,7 @@ class ImageHandler: return if self.pid: try: - os.kill(self.pid, signal.SIGKILL) + os.kill(self.pid, signal.SIGTERM) except OSError, exn: log.exception(exn) try: -- 2.30.2